bitkeeper revision 1.1176 (420be7310q_UvcXdnsevIZbXRZHJ4g)

Various cleanups.

Signed-off-by: chris@xensource.com

diff --git a/xen/arch/x86/vmx.c b/xen/arch/x86/vmx.c
index 01bc3720415af75e8b843528cdcdc48a92cb8de5..d410b3e4ddb7be321ee9de82e3b6ddfdeb8b558e 100644 (file)
--- a/xen/arch/x86/vmx.c
+++ b/xen/arch/x86/vmx.c
@@ -193,7 +193,7 @@ static void vmx_vmexit_do_cpuid(unsigned long input, struct xen_regs *regs)
 }
 
 #define CASE_GET_REG_P(REG, reg)    \
-    case REG_ ## REG: reg_p = &(regs->reg); break
+    case REG_ ## REG: reg_p = (unsigned long *)&(regs->reg); break
 
 static void vmx_dr_access (unsigned long exit_qualification, struct xen_regs *regs)
 {

diff --git a/xen/arch/x86/x86_32/seg_fixup.c b/xen/arch/x86/x86_32/seg_fixup.c
index 8fcc0112469aa20a52482c61a8d1122fd064950c..319056488feba57b99d69c5bd3747fbe74f211b6 100644 (file)
--- a/xen/arch/x86/x86_32/seg_fixup.c
+++ b/xen/arch/x86/x86_32/seg_fixup.c
@@ -293,7 +293,7 @@ int gpf_emulate_4gb(struct xen_regs *regs)
     u32           disp32 = 0;
     u8            *eip;         /* ptr to instruction start */
     u8            *pb, b;       /* ptr into instr. / current instr. byte */
-    unsigned long *pseg = NULL; /* segment for memory operand (NULL=default) */
+    u32           *pseg = NULL; /* segment for memory operand (NULL=default) */
 
     /* WARNING: We only work for ring-3 segments. */
     if ( unlikely(VM86_MODE(regs)) || unlikely(!RING_3(regs)) )

diff --git a/xen/include/public/arch-x86_32.h b/xen/include/public/arch-x86_32.h
index 65abc26efb5b764d629ef10ec858963f98088b1b..8f3c1477dc3e3688c52f541170e99d97b61e1080 100644 (file)
--- a/xen/include/public/arch-x86_32.h
+++ b/xen/include/public/arch-x86_32.h
@@ -94,9 +94,6 @@ typedef struct {
     memory_t address; /* 4: code address                                  */
 } PACKED trap_info_t; /* 8 bytes */
 
-/* So that we can use 'l' modifier in printf-style format strings. */
-#define u32 unsigned long
-
 typedef struct xen_regs
 {
     u32 ebx;
@@ -122,8 +119,6 @@ typedef struct xen_regs
     u32 gs;
 } PACKED execution_context_t;
 
-#undef u32
-
 typedef u64 tsc_timestamp_t; /* RDTSC timestamp */
 
 /*

diff --git a/xen/include/xen/keyhandler.h b/xen/include/xen/keyhandler.h
index e3d49c9086a237378d66e1fd4be7407ccfff2145..3c7c36ef667626e1aeade14079c81ea255d358e6 100644 (file)
--- a/xen/include/xen/keyhandler.h
+++ b/xen/include/xen/keyhandler.h
@@ -10,7 +10,7 @@
 #ifndef __XEN_KEYHANDLER_H__
 #define __XEN_KEYHANDLER_H__
 
-#include <asm/regs.h>
+struct xen_regs;
 
 /*
  * Register a callback function for key @key. The callback occurs in

diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h
index cd55353dfe28530497549131a99e7419a47c6aa2..65d04d1e5267a30ec277de47811eb9cbdff2da2f 100644 (file)
--- a/xen/include/xen/types.h
+++ b/xen/include/xen/types.h
@@ -26,6 +26,7 @@ typedef unsigned short          ushort;
 typedef unsigned int            uint;
 typedef unsigned long           ulong;
 
+#if 0
 #ifndef __BIT_TYPES_DEFINED__
 #define __BIT_TYPES_DEFINED__
 
@@ -42,6 +43,7 @@ typedef         __u8            uint8_t;
 typedef         __u16           uint16_t;
 typedef         __u32           uint32_t;
 typedef         __u64           uint64_t;
+#endif
 
 
 struct domain;